projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 982c0e6 5933055)
Merge branch 'master' into feature/package+vc
authorPhilip Kaludercic <philipk@posteo.net>
Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)
committerPhilip Kaludercic <philipk@posteo.net>
Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)
1  2 
etc/NEWS patch | diff1 | diff2 | blob | history
lisp/emacs-lisp/package.el patch | diff1 | diff2 | blob | history
lisp/vc/vc-git.el patch | diff1 | diff2 | blob | history
lisp/vc/vc.el patch | diff1 | diff2 | blob | history

diff --cc etc/NEWS
Simple merge
diff --cc lisp/emacs-lisp/package.el
Simple merge
diff --cc lisp/vc/vc-git.el
Simple merge
diff --cc lisp/vc/vc.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.